Autogenerated HTML docs for v2.9.0-137-gcf4c2
diff --git a/git-help.html b/git-help.html index cf8f6fc..42c1f32 100644 --- a/git-help.html +++ b/git-help.html
@@ -824,10 +824,10 @@ <p> Display manual page for the command in the <em>man</em> format. This option may be used to override a value set in the - <em>help.format</em> configuration variable. + <code>help.format</code> configuration variable. </p> <div class="paragraph"><p>By default the <em>man</em> program will be used to display the manual page, -but the <em>man.viewer</em> configuration variable may be used to choose +but the <code>man.viewer</code> configuration variable may be used to choose other display programs (see below).</p></div> </dd> <dt class="hdlist1"> @@ -842,7 +842,7 @@ format. A web browser will be used for that purpose. </p> <div class="paragraph"><p>The web browser can be specified using the configuration variable -<em>help.browser</em>, or <em>web.browser</em> if the former is not set. If none of +<code>help.browser</code>, or <code>web.browser</code> if the former is not set. If none of these config variables is set, the <em>git web--browse</em> helper script (called by <em>git help</em>) will pick a suitable default. See <a href="git-web--browse.html">git-web--browse(1)</a> for more information about this.</p></div> @@ -855,7 +855,7 @@ <div class="sectionbody"> <div class="sect2"> <h3 id="_help_format">help.format</h3> -<div class="paragraph"><p>If no command-line option is passed, the <em>help.format</em> configuration +<div class="paragraph"><p>If no command-line option is passed, the <code>help.format</code> configuration variable will be checked. The following values are supported for this variable; they make <em>git help</em> behave as their corresponding command- line option:</p></div> @@ -879,14 +879,14 @@ </div> <div class="sect2"> <h3 id="_help_browser_web_browser_and_browser_lt_tool_gt_path">help.browser, web.browser and browser.<tool>.path</h3> -<div class="paragraph"><p>The <em>help.browser</em>, <em>web.browser</em> and <em>browser.<tool>.path</em> will also +<div class="paragraph"><p>The <code>help.browser</code>, <code>web.browser</code> and <code>browser.<tool>.path</code> will also be checked if the <em>web</em> format is chosen (either by command-line option or configuration variable). See <em>-w|--web</em> in the OPTIONS section above and <a href="git-web--browse.html">git-web--browse(1)</a>.</p></div> </div> <div class="sect2"> <h3 id="_man_viewer">man.viewer</h3> -<div class="paragraph"><p>The <em>man.viewer</em> configuration variable will be checked if the <em>man</em> +<div class="paragraph"><p>The <code>man.viewer</code> configuration variable will be checked if the <em>man</em> format is chosen. The following values are currently supported:</p></div> <div class="ulist"><ul> <li> @@ -908,8 +908,8 @@ </li> </ul></div> <div class="paragraph"><p>Values for other tools can be used if there is a corresponding -<em>man.<tool>.cmd</em> configuration entry (see below).</p></div> -<div class="paragraph"><p>Multiple values may be given to the <em>man.viewer</em> configuration +<code>man.<tool>.cmd</code> configuration entry (see below).</p></div> +<div class="paragraph"><p>Multiple values may be given to the <code>man.viewer</code> configuration variable. Their corresponding programs will be tried in the order listed in the configuration file.</p></div> <div class="paragraph"><p>For example, this configuration:</p></div> @@ -922,29 +922,29 @@ <div class="paragraph"><p>will try to use konqueror first. But this may fail (for example, if DISPLAY is not set) and in that case emacs' woman mode will be tried.</p></div> <div class="paragraph"><p>If everything fails, or if no viewer is configured, the viewer specified -in the GIT_MAN_VIEWER environment variable will be tried. If that +in the <code>GIT_MAN_VIEWER</code> environment variable will be tried. If that fails too, the <em>man</em> program will be tried anyway.</p></div> </div> <div class="sect2"> <h3 id="_man_lt_tool_gt_path">man.<tool>.path</h3> <div class="paragraph"><p>You can explicitly provide a full path to your preferred man viewer by -setting the configuration variable <em>man.<tool>.path</em>. For example, you +setting the configuration variable <code>man.<tool>.path</code>. For example, you can configure the absolute path to konqueror by setting <em>man.konqueror.path</em>. Otherwise, <em>git help</em> assumes the tool is available in PATH.</p></div> </div> <div class="sect2"> <h3 id="_man_lt_tool_gt_cmd">man.<tool>.cmd</h3> -<div class="paragraph"><p>When the man viewer, specified by the <em>man.viewer</em> configuration +<div class="paragraph"><p>When the man viewer, specified by the <code>man.viewer</code> configuration variables, is not among the supported ones, then the corresponding -<em>man.<tool>.cmd</em> configuration variable will be looked up. If this +<code>man.<tool>.cmd</code> configuration variable will be looked up. If this variable exists then the specified tool will be treated as a custom command and a shell eval will be used to run the command with the man page passed as arguments.</p></div> </div> <div class="sect2"> <h3 id="_note_about_konqueror">Note about konqueror</h3> -<div class="paragraph"><p>When <em>konqueror</em> is specified in the <em>man.viewer</em> configuration +<div class="paragraph"><p>When <em>konqueror</em> is specified in the <code>man.viewer</code> configuration variable, we launch <em>kfmclient</em> to try to open the man page on an already opened konqueror in a new tab if possible.</p></div> <div class="paragraph"><p>For consistency, we also try such a trick if <em>man.konqueror.path</em> is @@ -985,7 +985,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-06-06 12:15:38 PDT +Last updated 2016-06-27 11:04:05 PDT </div> </div> </body>
